From 43b3d025d4a86ead5e67383601da8e92324ed64a Mon Sep 17 00:00:00 2001 From: jodogne-guest Date: Tue, 19 Mar 2024 11:08:09 +0100 Subject: [PATCH] d/rules: Fix armel buildd --- debian/changelog | 6 ++++++ debian/libdcmtk17t64.lintian-overrides | 1 - debian/rules | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d40543a3..94ae8977 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +dcmtk (3.6.7-10) UNRELEASED; urgency=medium + + * Fix build on armel. Closes: #1060104 + + -- Sebastien Jodogne Tue, 19 Mar 2024 11:03:28 +0100 + dcmtk (3.6.7-9.1) unstable; urgency=medium * Non-maintainer upload. diff --git a/debian/libdcmtk17t64.lintian-overrides b/debian/libdcmtk17t64.lintian-overrides index eb93b31a..85e79be7 100644 --- a/debian/libdcmtk17t64.lintian-overrides +++ b/debian/libdcmtk17t64.lintian-overrides @@ -3,4 +3,3 @@ libdcmtk17t64: package-name-doesnt-match-sonames libdcmtk17t64: embedded-library libdcmtk17t64: no-symbols-control-file -libdcmtk17t64: package-name-doesnt-match-sonames libdcmtk17 diff --git a/debian/rules b/debian/rules index ecefa16f..76e81c13 100755 --- a/debian/rules +++ b/debian/rules @@ -2,7 +2,13 @@ #export DH_VERBOSE=1 # export DEB_BUILD_MAINT_OPTIONS = hardening=+pie -export DEB_BUILD_MAINT_OPTIONS = hardening=+all +ifeq ($(DEB_TARGET_ARCH),armel) + # https://lists.debian.org/debian-arm/2024/01/msg00031.html + # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1060104 + export DEB_BUILD_MAINT_OPTIONS = hardening=+all,-stackclash optimize=+lto +else + export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=+lto +endif # needed for the tests export DCMDICTPATH=$(CURDIR)/dcmdata/data/dicom.dic -- 2.30.2